Drop weird structures for epilogue/prologue and use a QStringList.

diff --git a/gpsbabel/csv_util.cc b/gpsbabel/csv_util.cc
index b7c39e035ad81d4057e0c54e9b20134da433e152..8e979fce43cbade55b248ca4fc54434efbc514d8 100644 (file)
--- a/gpsbabel/csv_util.cc
+++ b/gpsbabel/csv_util.cc
@@ -722,8 +722,6 @@ dec_to_human(const char* format, const char* dirs, double val)
 void xcsv_file_init(void)
 {
   xcsv_file.is_internal = false;
-  xcsv_file.prologue_lines = 0;
-  xcsv_file.epilogue_lines = 0;
   xcsv_file.field_delimiter = QString();
   xcsv_file.field_encloser = QString();
   xcsv_file.record_delimiter = QString();
@@ -735,8 +733,8 @@ void xcsv_file_init(void)
   xcsv_file.description = NULL;
   xcsv_file.extension = NULL;
 
-  QUEUE_INIT(&xcsv_file.prologue);
-  QUEUE_INIT(&xcsv_file.epilogue);
+  xcsv_file.prologue.clear();
+  xcsv_file.epilogue.clear();
 
   QUEUE_INIT(&xcsv_file.ifield);
   /* ofield is alloced to allow pointing back at ifields
@@ -822,11 +820,7 @@ xcsv_ofield_add(char* key, char* val, char* pfc, int options)
 void
 xcsv_prologue_add(char* prologue)
 {
-  ogue_t* ogp = (ogue_t*) xcalloc(sizeof(*ogp), 1);
-
-  ogp->val = prologue;
-  ENQUEUE_TAIL(&xcsv_file.prologue, &ogp->Q);
-  xcsv_file.prologue_lines++;
+  xcsv_file.prologue.append(prologue);
 }
 
 /*****************************************************************************/
@@ -836,11 +830,7 @@ xcsv_prologue_add(char* prologue)
 void
 xcsv_epilogue_add(char* epilogue)
 {
-  ogue_t* ogp = (ogue_t*) xcalloc(sizeof(*ogp), 1);
-
-  ogp->val = epilogue;
-  ENQUEUE_TAIL(&xcsv_file.epilogue, &ogp->Q);
-  xcsv_file.epilogue_lines++;
+  xcsv_file.epilogue.append(epilogue);
 }
 
 static
@@ -1407,9 +1397,8 @@ xcsv_data_read(void)
   char* s;
   Waypoint* wpt_tmp;
   int linecount = 0;
-  queue* elem, *tmp;
+  queue* elem;
   field_map_t* fmp;
-  ogue_t* ogp;
   route_head* rte = NULL;
   route_head* trk = NULL;
   utm_northing = 0;
@@ -1436,8 +1425,7 @@ xcsv_data_read(void)
     rtrim(buff);
 
     /* skip over x many lines on the top for the prologue... */
-    if ((xcsv_file.prologue_lines) && ((linecount - 1) <
-                                       xcsv_file.prologue_lines)) {
+    if ((linecount - 1) < xcsv_file.prologue.count()) {
       continue;
     }
 
@@ -1445,15 +1433,12 @@ xcsv_data_read(void)
      * pre-read the file to know how many data lines we should be seeing,
      * we take this cheap shot at the data and cross our fingers.
      */
-
-    QUEUE_FOR_EACH(&xcsv_file.epilogue, elem, tmp) {
-      ogp = (ogue_t*) elem;
-      if (strncmp(buff, ogp->val, strlen(ogp->val)) == 0) {
-        buff[0] = '\0';
-        break;
-      }
+    foreach(const QString& ogp, xcsv_file.epilogue) {
+       if (ogp.startsWith(buff)) {
+         buff[0] = '\0';
+         break;
+       }
     }
-
     if (strlen(buff)) {
       wpt_tmp = new Waypoint;
 
@@ -2184,11 +2169,8 @@ xcsv_noop(const route_head* wp)
 void
 xcsv_data_write(void)
 {
-  queue* elem, *tmp;
-  ogue_t* ogp;
   time_t time;
   struct tm tm;
-//  char tbuf[32];
 
   /* reset the index counter */
   waypt_out_count = 0;
@@ -2201,11 +2183,10 @@ xcsv_data_write(void)
   }
 
   /* output prologue lines, if any. */
-  QUEUE_FOR_EACH(&xcsv_file.prologue, elem, tmp) {
-    ogp = (ogue_t*) elem;
+  foreach(const QString& line, xcsv_file.prologue) {
     // If the XCSV description contains weird characters (like sportsim)
     // this is where they get lost.
-    QString cout = ogp->val;
+   QString cout = line;
 
     // Don't do potentially expensive replacements if token prefix 
     // isn't present;
@@ -2240,9 +2221,8 @@ xcsv_data_write(void)
   }
 
   /* output epilogue lines, if any. */
-  QUEUE_FOR_EACH(&xcsv_file.epilogue, elem, tmp) {
-    ogp = (ogue_t*) elem;
-    gbfputs(ogp->val, xcsv_file.xcsvfp);
+  foreach(const QString& ogp, xcsv_file.epilogue) {
+    gbfputs(ogp, xcsv_file.xcsvfp);
     gbfputs(xcsv_file.record_delimiter, xcsv_file.xcsvfp);
   }
 }

diff --git a/gpsbabel/csv_util.h b/gpsbabel/csv_util.h
index c6440827e05990dd31b895decc2e13a3b1dc4235..ea46fa70ed151bd0dc81b65398b4ca2e04968fe6 100644 (file)
--- a/gpsbabel/csv_util.h
+++ b/gpsbabel/csv_util.h
@@ -88,12 +88,6 @@ typedef struct field_map {
   int options;
 } field_map_t;
 
-/* a queuing struct for prologues / epilogues */
-typedef struct ogue {
-  queue Q;
-  char* val;
-} ogue_t;
-
 /* something to map config file constants to chars */
 typedef struct char_map {
   const char* key;
@@ -111,14 +105,11 @@ class XcsvFile {
 
   bool is_internal;            /* bool - is internal (1) or parsed (0) */
 
-  int prologue_lines;          /* # of lines to ignore at top of the file */
-  int epilogue_lines;          /* # of lines to ignore at bottom of file */
-
   /* header lines for writing at the top of the file. */
-  queue prologue;
+  QStringList prologue;
 
   /* footer lines for writing at the bottom of the file. */
-  queue epilogue;
+  QStringList epilogue;
 
   QString field_delimiter;     /* comma, quote, etc... */
   QString field_encloser;      /* doublequote, etc... */

diff --git a/gpsbabel/xcsv.cc b/gpsbabel/xcsv.cc
index a50c176b129fa34d129fa54a44bc8ab91bfc0519..b47051cc0c2d3561a9ec11efcb305647d7bd20b7 100644 (file)
--- a/gpsbabel/xcsv.cc
+++ b/gpsbabel/xcsv.cc
@@ -106,7 +106,6 @@ xcsv_destroy_style(void)
 {
   queue* elem, *tmp;
   field_map_t* fmp;
-  ogue_t* ogp;
   int internal = 0;
 
   /*
@@ -115,26 +114,10 @@ xcsv_destroy_style(void)
    */
 
   /* destroy the prologue */
-  QUEUE_FOR_EACH(&xcsv_file.prologue, elem, tmp) {
-    ogp = (ogue_t*)elem;
-    if (ogp->val) {
-      xfree(ogp->val);
-    }
-    if (elem) {
-      xfree(elem);
-    }
-  }
+  xcsv_file.epilogue.clear();
 
   /* destroy the epilogue */
-  QUEUE_FOR_EACH(&xcsv_file.epilogue, elem, tmp) {
-    ogp = (ogue_t*)elem;
-    if (ogp->val) {
-      xfree(ogp->val);
-    }
-    if (elem) {
-      xfree(elem);
-    }
-  }
+  xcsv_file.epilogue.clear();
 
   /* destroy the ifields */
   QUEUE_FOR_EACH(&xcsv_file.ifield, elem, tmp) {
@@ -341,11 +324,11 @@ xcsv_parse_style_line(char* sbuff)
                     } else
 
                       if (ISSTOKEN(sbuff, "PROLOGUE")) {
-                        xcsv_prologue_add(xstrdup(&sbuff[9]));
+                        xcsv_prologue_add(sbuff + 9);
                       } else
 
                         if (ISSTOKEN(sbuff, "EPILOGUE")) {
-                          xcsv_epilogue_add(xstrdup(&sbuff[9]));
+                          xcsv_epilogue_add(sbuff + 9);
                         } else
 
                           if (ISSTOKEN(sbuff, "ENCODING")) {